From: Fred Pierresteguy Date: Wed, 26 Jan 1994 17:35:31 +0000 (+0000) Subject: Wed Jan 26 12:23:12 1994 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu) X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~93384 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=78614721380456edb71ba1c6d4d4a161a1bd758d;p=emacs.git Wed Jan 26 12:23:12 1994 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu) * xdisp.c (update_menu_bar): Add USE_X_TOOLKIT conditional and test FRAME_EXTERNAL_MENU_BAR. --- diff --git a/src/xdisp.c b/src/xdisp.c index c2a492ecbc0..2dbbbabb0d0 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -946,7 +946,11 @@ update_menu_bar (window, just_this_one) /* When we reach a frame's selected window, redo the frame's menu bar. */ if (!NILP (w->update_mode_line) +#ifdef USE_X_TOOLKIT + && FRAME_EXTERNAL_MENU_BAR (f) +#else && FRAME_MENU_BAR_LINES (f) > 0 +#endif && EQ (FRAME_SELECTED_WINDOW (f), window)) { /* If the user has switched buffers or windows, we need to